Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[8.10] [DOCS] Adds section about tokens to ELSER conceptual (backport #2568) #2570

Merged
merged 2 commits into from
Oct 18, 2023
Merged

[8.10] [DOCS] Adds section about tokens to ELSER conceptual (backport #2568) #2570

merged 2 commits into from
Oct 18, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 18, 2023

This is an automatic backport of pull request #2568 done by Mergify.
Cherry-pick of f9c8a20 has failed:

On branch mergify/bp/8.10/pr-2568
Your branch is up to date with 'origin/8.10'.

You are currently cherry-picking commit f9c8a202.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/en/stack/ml/nlp/ml-nlp-elser.asciidoc

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@szabosteve @mergify
[DOCS] Adds section about tokens to ELSER conceptual (#2568)
424ec1c 
* [DOCS] Adds section about tokens to ELSER conceptual.

* [DOCS] Adds 'discrete' flag to section.

(cherry picked from commit f9c8a20)

# Conflicts:
#	docs/en/stack/ml/nlp/ml-nlp-elser.asciidoc
@github-actions
Copy link

Documentation preview:

@szabosteve szabosteve merged commit ab7f1c7 into 8.10 Oct 18, 2023
1 check passed
@szabosteve szabosteve deleted the mergify/bp/8.10/pr-2568 branch October 18, 2023 08:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@szabosteve szabosteve szabosteve left review comments

Assignees

@szabosteve szabosteve

Labels
backport conflicts
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@szabosteve